Merge from trunk.

author Eli Zaretskii <eliz@gnu.org>

Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)

committer Eli Zaretskii <eliz@gnu.org>

Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
author Eli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
committer Eli Zaretskii <eliz@gnu.org>
Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
diff --cc Makefile.in
Simple merge
diff --cc lisp/loadup.el
Simple merge
diff --cc nt/makefile.w32-in
Simple merge
diff --cc src/Makefile.in
Simple merge
author	Eli Zaretskii <eliz@gnu.org>
	Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
committer	Eli Zaretskii <eliz@gnu.org>
	Thu, 16 May 2013 09:58:56 +0000 (12:58 +0300)
		1	2
Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/loadup.el	patch \|	diff1 \|	diff2 \|	blob \| history
nt/makefile.w32-in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history